Solved few issue , but more comed