Debugged more of macros and free+addtolist