better handling of name/comment lengths. few other tweaks.