Date rles and bug fixes