made a few small fixes