some fixes #1