solved some more problems