bugs fix batch 1