Comments updated and added