Fixed some stuff, still faulty