Added patch for more gpio/ints and some cleanup