add a case, some fixes