solved several more problems