adjusted dependencies + comments