new stuff & clean up
some stuff