stricter dependencies + misc improvements