Stronger crypto

Closes #144