New stuff

mostly cleaning up