cleanup
test fixing
converging!