performance improvements & bugfixes

-