a few small bugs