knock a couple of items off the to-do list. There may still be some associated issues and/or feature requests but we'll deal with those separately.