controller cleanup
activation code small fixes