solved some more