1) In California, after prop 36 passed in 2012, what happened to the people already serving time in prison

2) In California, until prop 36, what type of crime could get a person life without parole???