small changes and some comments