Just print off a copy of my redone map which has none of those issues. Check Variants.