ordered dependencies and edited comments