FIX: Bug with market total, add Yen support