more fixes #16