fix comments, layout and message tweaks