phase support and envelope fixes