Simplified a lot of logic
Also corrected some level design flaws on Map2