otw - Fixed a few more things...