Bug Fixes and Code Organization