Bug Fixes and Optimizations?...(rs)