Fixed issues (not fully fixed yet)

down to 139 or so issues then have to update form the old ID system to
the new 1.7 system