new stuff

lots-o-fixes