Giving this a bump with a few updates.