Adding radix and other little fix