things are generally better in this commit