Bugfixes

Now it is quite stable