Added hknumeric + minor changes