timer now continues after 25m end // other improvements