Added GPS sensor and touch
Clean up code