Bugfixes and efficiency.