General updates to various bits