some touches suggested by @cordoval. fixes #66