rename "Handler" to "Feature"

I like this noun better.

Also spotted some bugs. :-I