Bug Fixing and Optimization