Repair many things, found errors on comment