Cleaned up a bit, fixed Decrypt