update
lots of bugfixes