minor changes to activation
add TODO