more ARC conversion
arc conversion for iOS stuff
minor tidying