otw - A few small changes as a result of testing.