Several debugging changes made after tests on guillimin