Movement and capture bug fixes