Fixes #185
Made dates consistent
Merge pull request #208 from heierj/messagefixes

Messagefixes