Fix typos, simplify setup