ios6 code put back, TODO.txt cleaned - added stuff from my other TODOs