Testing performance improvements

[hmottestad]

This is WIP for testing various performance improvements.

First commit contains various small changes to make the code build on my machine and to make it easier for me to test things.

The next commits contain different improvements that make a significant difference to the performance.