otw - Fixed a few more issues.  Still having problems with diagonals.