few more tweaks - slave mode broken...