fixing all the errors sven made.