Fixed activation error and updated todo