Countdown Fixes
Bug Fixes and Additions.