Bugfixes

Also, README.