adding more wallet support and organizing a bit
adding more wallet support and organizing a bit