Fixed many a thing

Not much actually.