updated json dump and added json loading, minor bug fixes
added a test encryption file and updated crypto