Everything I missed yesterday

Fixes #108