Minor tweaking everywhere