Fixed #17 (ESC key) & some formatting