some more bug fixed