fixed some stuff, maybe?