some small changes ...