Bug Fixes and Design Improvements.