Solved several things