some work done on integer conversion
some fixes on the integer system (opted for the mask again)