Add detection for DOS versions of 0.21 and 0.21a

Also reorganize some stuff