final cleanups for master/slave mode
fixed a few typos

Signed-off-by: madwings <stily_c@yahoo.com>