Fix map changes during ready-up again!

Some whitespace fixes too