just solved some stuff