minor regex changes