Fix an int typehinting bug & few other things.
Cleaned-up unneeded code & comments