Cleaned up a bit, fixed Decrypt

I'm assuming this is the most recent copy of the code - as far as I can tell everything works now after these changes.