whoops, a few small fixse