lots of bugfixes... argh