Trying to resolve TasksWindow.js errors
merged some stuff and some things