Slight fixes to the salsa algorithm but it's still not right