corrected some faults that were revealed when running all modules together