General updates for better running.