Various Updates (1/3) (Patchset 2)

this should be ready to go :)