tweaks: reshuffle a few things
3 files changed