moved a few small things around