minor reshuffles of stuff