Changes according the review notes (fixed bugs)