Fix missing newlines add more messages, etc