More Bug Fixes

Fixed more bugs in the combat loop and added a number of troubleshooting prints commands.