* Solved some more problems