lots of bug fixed