i #230 updated comments, added catches

I normalized the comments by having it follow a format. I added if wrappers to catch null values.