Add some corrects to comemnts and docs