fixes to fields and method inputs