tweaks to dict passed to upload_bill_data function, new manual meter data entry is working, but need to add robustness on the data calcs