More fixes

App is still not ready, but getting there.