Added some comments.
Made button toggle callbacks include the modifier state.