fixed some wrongs