consistency check

consistency check and added the missing comments