Updated some output and parameters, fixed a few cosmetic bugs.