Formatting changes and a couple of hacks to support winch.