Time localisation, and bug fixes