fixes and additions to other classes