Fix bugs. Make dollar amount save correctly