minor improvements
minor fixes
changes to sync up with source control