Add Depends and fix some format