solved some stuff