timer deleted and bugfixes