Some clean up in addTask macros, added centrality selection and event classes to...