Minor fixes + fixes #3 + fixes #8