Small Changes to lots of things