Fixes

Fixes #66 
Fixes #65 
Let the users make up there own mind, I don't think it really helps keeping engagement. But happy to be convinced otherwise.