Few comments fixxed