Fixes to allow app to run on this branch

Waiting on finalization of mainVC on branch 'dennis'.