Adding new comments for clarity
Updating null checks

Sorry, but this just doesn't look right to a C++ programmer. :P