Various Citizen & clothing source file updates