smal fixes, preparations for time based local records