Fixed s2k implementation somewhat.