Added scaling functionality to Movement and fixed bugs