fix bugs: fixed some wrongs of form