some more good organizational changes