Small updates, moving things around