Added new messages; fixed TODOs