Fixed errors from last commit, added additional commenting.