added core app, changed other things