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