few changes I've picked up from @zwoop's twitter