Refactor TASKS_NODE and RESOURCES_NODE constants into DataStore since it is the only one using it
Miscellaneous fixes

Not even sure where those bugs came about