Combat & other bug fixes, more iOS 7 compatibility