Added iOS 8 :) and some ordering updates