still fixing things before stable build 1.7 comes out