otw - Updated a few classes, mostly minor changes.