Various changes from recent trip