Cleaning up messages

Closes #13
Closes #12
Closes #15