several small changes