Bug fixes and major fix to moving platforms