Minor updates, adding full decrypt/encrypt utils