Addressed bugs

Removed dependency on countdown plugin