Added more movement and bugfixes