tweaks for iOS 7 and other cleanup and improvements