fix all apparent bugs... ready for V0.2 demo, hopefully