added deps, bug fixes