Fixed comments and else nothing bug.