iOS 6 compatibility, bug fixes, cleanup, additions