URL fix and some code comments