Lots of important updates

Too many to mention