minor changes to masterController