* Small fixes and Comments