Fixed the number of seconds

Closed last pull request, this one includes more fixes