Large updates on lots of small things

:)