Fixing many of the issues and fleshing out the app