replaced strange symbols and some refinements