policy improvement, still not tested
bugfixes