Changes to filenames
Add annotated PDF, reformat output naming conventions
Un-comment tmp cleanup