Cleaned some bugs in dreamcatcher.core and dreamcatcher.macros