updates #21
updates #167
closes #298