lots of bug fix still issue