Solved most of the issues.