more codefixes

now app is an instance of model - constructor class, former app