Add app and fixes