Use Atom and fix nits (Issue #122)