fix amount remaining and hours left issue