Adding some fixes and hashing