fix dependencies and dont clobber optional args