style tweaks and comment support