small bugs, single not fixed