add comment and defaults