prefixed utf8 and whirlpool to avoid symbol conflicts
fixed some minor merge conflicts