mark - added ETR calculation
mark - added TN and TX
mark - added JSON serialization for old attributes; tests working
mark - docstring
mark - minor changes to compute