updated and fixed comments