Code updates from internal
Merge pull request #82 from thedeuceII/code-ups

Code Updates