fixes and tweaks - still not loading app properly