updated dependencies
fixed a couple small issues
version bump
fix merge conflict