Minor tidy up.
Fixed copyright block.
Added messages for new Encrypt error codes.
Added missing includes.