3 alpha

closes #202
closes #203
closes #209