tiny bits more functionality plus full test coverage