updating dependencies, fixed a few bugs