Fixed more hunting issues and logic errors. #27