Minor additions to checks being made. Removed comments associated with
bugs (after bug has been fixed)