otw - Merged serveral changes from the old repository.