a few late changes that were kicking around