Added missing 'return false' and some other minor thing I can't remember
Added missing 'return false' and some other minor thing I can't remember

coderstephen/walrus,coderstephen/walrus,coderstephen/walrus