Tidy a few things up, allow multiple comment lines.