Funf v0.4 bug fixes and performance issues.

Take a look - pipeline changes are being used in the app in my fieldtest repo (haven't committed the changes for it yet, though).