closes #361; closes #393