More key chords. More OS x support. Refactoring