Fixed minor (major) bugs regarding movement