Added possible TODO
Fixed options lambda-list bug
Added small kludge to solve bug