[zaneil]

Thanks for your thoughtful feedback! I'll implement 1 and 2 by end of week. For #3 those aren't active or useful even if they were active. But I can clean it up anyway (pardon my mess).