Map update 1 (+ fixing game rules)