Minor tweaking of EVERYTHING