Added answers + adjusted map-size + minor tweaks