more renamings
cleanups
implement function parameters and calls