Extensions of the 2D Transmission and Escape Probability neutral particle transport method in treating the spatial non-uniformity of collision sources and neutral energy effects are presented. These extensions have been tested by benchmarks against Monte Carlo calculations for specially designed models and for realistic DIII-D discharges. The comparisons indicate these extensions improve accura...