corrected some issue