Cleanup comments.
Add missing defines.