Nathaniel Bug Fixes