dev

solve bugs