Final performance correction / bugfix. Done