Tweak missing mapping
New mappings for marker
First draft of 1.6 update