corrected few stuff