Map Update

Fixed layers, collision, and added some warps.