Map Update

Fixing flaws and adding attachments to each other.