Changed various things