made a bunch of updates to macros and addToList

trying to figure out why it segfaults on line 239. Something wrong with
GET_NEXT_FREE probably