Solved a few more problems.