updates after a few run-throughs