Performance and bugfixes. 0.1.6