Add stuff.
Multiple files support and some format changes.