Bug Fixes + Cleanup