more changes to general code