Added sampler handler, made everything in NEI cache sorted, misc cleanup