Fixed Comments Adding Validation

Fixed some of the comments to be easier to understand and started
adding validation.