Add comments, truncation, option parsing, etc