Big fat update

Too many to go though