Various bugfixes, better faster stronger.