fixed some rando stuffs
Merge branch 'master' of https://github.com/Faneron/Faneron