bugfix, dev tool improoved