Improved Landfill Simulations Based on the CalTOX Framework