fixed wrong parameters bug in decrypt; clean up