Add of comments and some fixes