Fix a few bugs and start work on messages