Added a lightswitch and fixed a scrubber