Fixing bugs, further cleanup. Slight change in behavior to how active is set.
Fixing bugs, further cleanup. Slight change in behavior to how active is set.

ndoit/fenrir,ndoit/fenrir,ndoit/fenrir,ndoit/fenrir