client tools fixes; this and that