Some renaming, some missing support, some rationalisation, plus adding platform flash support