Mark 217 stable, some minor feature updates