Add hlld solver from athena and other changes.