another bug fixed, some left...