more bug fixin