Fixes to external mappings, including making it an option. Added some mappings.
Dropping subproperty(), use subproperties() instead. Fixed test accordingly.
Various tidying.