the horrible lots of fixes commit message because I waited to long with commiting stuff and I'm lazy