Solved some stuff