Errors fixed or uncomment