varius small changes