fixed some stuff, but tests won't run