Bug Fixes and Feature Requests from Brian