several updates and bugfixes

many improvements, should be somewhat workeable now