fixed some stuff, should work