some small changes and fixes