otw - A few more changes.