clean up so comments and add _ to urls is ok