Messaging fixes & DRY
Merge branch 'master' of git://github.com/flavour/eden