basicly last commit with last overall-corrections