a big commit of bunch of random shit I've been doing over the week. from now on, smaller commits, hopefully