More template handling. Remove hyphen at end of line. Replace ' with ’.