fixed issues for today. app is significantly more stable