Feature Adds and Bug Fixes