Time localisation and bugfixes