Fixed Movement / Huge Cleanup