Parser comments
Fixed some macro recursions
Removed debug junk