More comments added, along with one more test case.