Added comments

+ minor changes
+ comments