Small adjustments, now 2 maps work