Power up multibulbs

resolve conflicts, and ready to merge again