A few more messages, cleaning up TODO