New tilemap and minor fixes.