IJHMT3 very little changes only a few fixes, too tired to continue