Hunting Pearl Creek: Bug Fixes

Bug Fixes and Improvements