cleanup and some parameter changes...