update deps & few fix