General updates to make stuff better