Further minifications and bugfixes.
Let me risk a little more light.