Body cleanup removed
Movement calculation fixed
#6