Many fixes and mapping additions