Add documentation and change a few things for Messages