Add some more structure
Parse options
Omit function statement
Mention the missing file
Make fill vector more clever