Updates numerous

Can’t really be bothered with comments anymore!
Nearly there!