Do some fixes and work on fixing countdown