more ordering fixes. marks seem to be functional