lots of bugfixes. actually running now ;)