Added comments
renamed several 'propn' params to 'propn-id'