fix underscore convention.
notes and fix acl option.
comments.