Minor changes including badges and easier-to-understand regex