more classes pkg private
more parameter fixes