Bug fixes and rough end movement script