fixed a couple of things in the bulk