Clean up, and more debugging

Pretty much a solid prototype. Also deleting a message has been written,
tested and integrated.