added all deps
improvements