somehow improved movment, some minor bugs