Fixed bugs and improvements editorial annotations