Minor bugfixes
Some additions
Decrypt added