latest tweaks
yay! tests are finally working