Updates to comment placement and exception fixes
Updates to comment placement and exception fixes