fix ciphersuite storage
misc updates