misc changes that are wrong