some fixes #2