Added some hasing features + bugfixes