Add debug flags
Change define
Add comments