Small esos to todo file
Better commented a few macros