Closes #24
Closes #25
Tidied up messages