A plethora of minor changes