Various

Implement @sciurus comments from issue #1