some changes, fixes #1