more encryption fixing
more comments