misc small changes