fix hashes, add macro