Added/aligned a few more comments