Some good changes to good stuff