new stuff
reshuffling, minor updates