More work on ordered execution, various fixes