Lots of fixes I dont want to lose.