Fix tons of crap
Merge branch 'master' of github.com:CarletonDevX/uhack-walrus