new macros
Updated entity macros
Fixed setters
Cleaned code, massive use of macros