fixed commenting bugs