Added percentages to amounts exchanged.
Merge branch 'master' into massive_db_changes