fixed some stuff other stuff broken though :(