Update framework and dependencies, fix/improve some code