Making return trips work (still in progress); also formatting changes, some model cleanup, etc. [#52124271]