Movement rate fixes, collision fixes