fixed a couple of small bugs