various fixes #1