minor changes + comments