a few more small alterations with comments