Fixed some stuff, still not working