hashing now works, and cleanups
stuff