Added more in recent commit.  Let me know what you think.