fix bug related to account_id versus account, and change values to integers instead of strings