Some minor and some major improvements