fixed lazy initialization exceptions that would come after adding comments. All tests are passing as well :)