Functorized Hashtbl and bugfix.