A library like Bounce2 can do all the heavy lifting for you. But like I said, with all the delay()'s and no array's it's a complete nightmare to implement it. I would say now you have bugs it's a good time to start V2.0.0 of the software from the ground up 