fixes some wrong parts