Minor fixes and edited some comments