updated commenting and a couple of variable changes