final fixes

i would say it is 95% operational :)