several minor adjustment by lrl026