Fixing a bunch of issues and making things better

Pretty much yeah.