* misc changes