fixed remaining issues from the merges
application is up and running