ok fixed stuff, I hope