added Salsa10 & Salsa20

some other minor changes