Use composition data in the weighted expenditure calculation
Updated server
Restrict outgoings data to actual expenditure