fixed bugs and basic movement