Comment updates, removed broken error checking