Added double press fix and clean up
Oops, breaked the build. It's fixed now