fix some angle bracket and unicode issues