use more credentials for transarmor transactions
merge
clean up the code a bit