new app and some fixes