Fixing the flick bug and resolving a couple of jshint errors