lots of bugfixes, new subtle features