a few additions, changes and fixes