finishing, fixes #1

...