Recap commit: fixes #6, fixes #7, resolves #8, closes #9