getting there with the new design. Bunch of bugs squashed while at it :)