Update output.
Temporary hacks and clean-ups.
Clean-up build file.