squashed a couple of bugs. with any luck we're now ready to demonstrate