improved points regex