Some non-error elements are finally showing
Additional fine tuning.