updates to work with new system, bug fixes, enhancements carried over
merge