latest misc changes