Fixing and adding some comments