errors and mistakes fixes