New wastage systeam, bug fixes