misc changes

misc changes