Moved some things around a little, and fixed something I borked in another queue.