Minor fixes, still not moving correctly.