final changes, fixes #2