added an on light + other tweaks