Change Bunch of stuff and add some stuff
Merge branch 'master' of https://github.com/n3vrtf2/n3vrhudtf2