fixed some stuff found in Gothenburg