Bugfixes + generating time