closes #168
closes #160
closes #165 (probably)
closes #153 (probably)