updated some token names, fixed bug in confirmation, sub-heading support now works.