fix bunch of small issue