closes #200, closes #196