Bug Fixes & Captain Rule Fixes