fixed a couple of bugs in the prototype