Regex fixes and removed 2010 header.