Fixed Scheme
Bug fixes and performance enhancements.