Fix typos, add more GUI stuff, add tests