I would also add a clause where if you meet the timeframe to vest, you can exercise that within a certain time of leaving the company irregardless of the reason

I would also add a clause where if you meet the timeframe to vest, you can exercise that within a certain time of leaving the company irregardless of the reason for leaving (IE: termination for cause etc.) to ensure that employees get what they earned.