Cleaned up mappings and added spiffy new ones.