Improved help messages

This would have saved me some time ;-)