closes #123, closes #124