fixes to Salsa20 spec suggested by Sean (thanks!)