Added total amount and some weaver formatting