Add turn order counter to keep track of turns in combat, to better remember how long buffs and effects are still in place. The current method often relies on players remembering this but often forgetting what turn it is. I suggest that after all tokens have been added to the turn order the DM can press a "start combat" button and whenever he cycles through all comvbatants the counter increases by one. You would need build a way to reverse a turn, in case the DM made a mistake and skipped ahead.