Fixed Unit Addition/Removal & Added Map