Various Updates (1/3) (Patchset 3)

this should be more clean than previous one :))