Currency management

This adds better currency management including SP names for better display.

Fix #373 
Fix #374