some small changes and additions