Adding in minor bug fixes
Minor updates to the Controller and App classes