fixes v2

the blame should probably be prettied up a bit: http://cl.ly/image/1d3o2U2M1M2g