Minor fixes. App almost ready to go