Lots of fixes

and some deletions also. Because deleting = *yay*