code clean up and updates to correspond with fixes, updates, revisions in main app