Bug Fixes and Feature Additions