Minor performance tweaks.
Now outputing almost all possible data.