added light swtich and tweaked a bit