many changes, htable.c and htable.h removed