Couple fixes to regex based on lots of submissions