Cleanup energy plotting, insert more outside weather into database