pass all tests

respond to maintainer comments

reinstate assignment of t

correct typo

correct typo

pass linter some more