more work on mount mappings