updates/fixes

- see changes in readme for details