Critical patch

This critical patch fixes little bugs and one critical bug that cause an error about having end (the time still goes despite of the notice)

We apologize and have a nice play!