minor bug fixes
check point
Check point, ready for crashlytics
clean up