marginal improvements on smoke test, plus indentation fixes in the app