Bug fixes.
Attempted compile with watcom(no luck yet).