countdown and other fixes