aaand more fixes #10