Comments, fixed prievious warnings