various fixes #2