legal fixes
added macros OO, and legal fixes