some minor fixing/improvment