Fixed movement/capture detection bugs