misc changes

fixes