Fixed some of the dead functions.
Merge branch 'master' of https://github.com/ripxfrostbite/karren-sama