changes in notation and improvements