minor change
added tests, reworked task, wired in options