small changes from martin