added t16_2pc, fixed swipe, various other junk