City rules on vaping, smoking broaden

by