Cleaned up weightings, add empty indicators and profiler.