added keccak + bugfix