bug fixes and further recoding of the dilution, WIP