Basic Changes, Bug Fixes, And Optimization