Fixed a lot of things, updated some more deps