Fixed URL mappings and doco.