Bug Fixes
Cleaned Up