fixed bugs, retooled hmac, hmac test working