Update and fixed files from comments.