Hash table bugfix and improved logging
4 files changed