tightening up setup
Merge pull request #6 from harlo/with_messaging

tightening up setup