Clean up, "Both" support, began adding touch support