Fix of bug + new comments