updating code for keystore truststore etc
some commit