Updated some TODOs, libs, and fixed death bug