comments
minor cleanup
add Times exp
complicate test case slightly