Cleanups, newer backward movement fix