Added more regex. Fixed minor issues.