various improvements (no bug fixes). Closes #1