updating comments and consistency