Erammp updates

Sorry - more changes as a result of Erammp feedback

I'm happy for this to go straight to production as the Erammp data model is still draft so if there are any bugs it doesn't matter