comments and other tweaks