Improved

Fixes number of issues, see commits.


Further a cleanup of issues:
Close #20 - is already closed by PR 23.
Close #7 - no response and incomplete
Close #5 - one time issue?