Fixes #11 - some more fixes