Updates to 2013-07-bath after walkthrough