Moved a few little things around