Various changes to various files, vague commit mg ftw