More depscripts and some edits