Added touch support and straight fire