Turned on button reading.  Cleaned up some comments