Update dependencies, clean up code

[cfcosta]

Just some changes that I needed to do to get this to work (as well as nix support which I use, you can remove it if you want, it is on a separate commit).