added and fixed comments