Get app up to speed to make it releasable again, several fixes applied!