Updates to lightswitch and spin_motor