DecryptoCat

Try to address some issues from [DecryptoCat](http://tobtu.com/decryptocat.php),

- wasting random bytes
- odd change from a17bb1599463