Smoother movements, fixed a couple of bugs