more bugfixes, mostly stable now