Standardised rf properties and added more documentation on properties within merge-flow.properties