fixes on function parameters
implement class methods