some cleanup, fixes for 2nd submission to app store