updated dependency order
small fixes