Adding lastrun and cleaning up resource names