Cleanup. Input is working well except one button press is being interpreted as many.