(Hopefully) final bug fixes before actual evaluation.