2nd map, more bugfixes