Move some things around and tweak