fixup more whitespace
add more mappings