Add a new e2e test; fix some bugs/usability problems

Mostly addresses #3. Needs more checking, still.