Addressed a couple of coding errors