[don't merge] Various fixes#19

dsyalex wants to merge 2 commits intoCorran-Raisu:masterCorran-Raisu/FLCompanion:masterfrom

dsyalex:factionimportdsyalex/FLCompanion:factionimportCopy head branch name to clipboard