tweaks and fixes for the new app format