Minor changes, ready to get hashes