Add ENVIRONMENT?, LEAVE and a few other missing pieces.