daily update 0628-0630

Para's Update
fix several bugs