format currency better
update swap format, fix bug
fix swap formatting and bugs