Solved most issues