Solved a couple more problems