Fixed Half of the issues.