updates

some reshuffling