Add more swfs and trace output.
Merge pull request #1635 from mbebenita/overlay

Add more swfs and trace output.