fixed all problems