Small fixes for time module, project cleanup