Bugfixes, hema optimalization & tweak-ups.