misc comment bug fixes, clean up, iOS 7 tweaks