Update readme and improve general consistency.