[CB|HW] -- various bits
this is a terrible commit message, blame Luke