more fixes #104