Added/corrected some comments, also show keyboard shortcuts on buttons