minor updates
WIP commit port a bunch of stuff to Atom