Numerous Bug Fixes