tweaks
moving some things around