Various updates, to many to list and I don't feel like splitting them up into separate commits