aaah. unfortunate timing. i did a lot of cleanup on this class in #62 too. we will need to sort out which changes from where to keep.