no major changes; reran some tests