Fixing bugs, updating dependencies