clean up, added ability to use external properties for crypto settings, allows for external keystore, added role serice