Started to fix some of the issues.