bugfixes on command