Cleaned up code, added todo messages

Also added a couple more catches. Need to convert all message sending to
MessageM.send