solved two more problems