fixed deps and minor fixes