minor updates, 2 errors remain in tests
fixed test, must have been missed from last round of work
missing parameter from last round of changes added back