Some changes, countdown fix