long-due fixes
more resources