Add some comments

+ minor changes