Finally straightened-out routing mess + conditional load of JS for wizard -- also, some housekeeping...