minor additions and generalizations

minor additions and generalizations #146